merge trunk

diff --cc lisp/ChangeLog
index c5c4a1194dcdb890d56208b8d6d1db07439c785d,3723121fe7c68b156d8bdcc2293d700c12102a93..73253c179d0214320a78b9401ac3013ed7d916b9
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,7 -1,15 +1,19 @@@
+ 2012-02-02  Glenn Morris  <rgm@gnu.org>
+ 
+       * server.el (server-auth-dir): Doc fix.
+       (server-eval-at): Doc fix.  Give an explicit error if !server-use-tcp.
+ 
+       * subr.el (run-mode-hooks): Doc fix.
+ 
+ 2012-02-02  Juri Linkov  <juri@jurta.org>
+ 
+       * image-mode.el (image-toggle-display-image): Remove tautological
+       `major-mode' from the `derived-mode-p' test.
+ 
 +2012-02-02  Kenichi Handa  <handa@m17n.org>
 +
 +      * (compose-region): Cancel previous change.
 +
  2012-02-02  Kenichi Handa  <handa@m17n.org>
  
        * composite.el (compose-region, compose-string): Signal error for

diff --cc src/ChangeLog
index 1fd751f8aafe6467b20f545d8ea2716e7d706f41,862102476d2fdbe1daa2185c283eccf4732d1b63..961e2f6788e5d7feae4e0990f647df87a24c0194
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,8 -1,13 +1,18 @@@
+ 2012-02-02  Glenn Morris  <rgm@gnu.org>
+ 
+       * callproc.c (Fcall_process, Fcall_process_region): Doc fix.
+ 
+       * nsterm.m (syms_of_nsterm) <x-toolkit-scroll-bars>:
+       Unconditionally set to t.  (Bug#10673)
+       * nsterm.m (syms_of_nsterm) <x-toolkit-scroll-bars>:
+       * w32term.c (syms_of_w32term) <x-toolkit-scroll-bars>:
+       * xterm.c (syms_of_xterm) <x-toolkit-scroll-bars>: Doc fix.
+ 
 +2012-02-02  Kenichi Handa  <handa@m17n.org>
 +
 +      (x_produce_glyphs): Cancel previous change.  If cmp->glyph_len is
 +      0, do not call append_composite_glyph.
 +
  2012-02-02  Kenichi Handa  <handa@m17n.org>
  
        * xdisp.c (BUILD_COMPOSITE_GLYPH_STRING): Initialize first_s to